refactored User and Test to better names