Merge "Add @covers tags to user tests"