Added one more user test
Finished cleanup of User and DB classes.