Finish User tests and code clean up