Fixed existing tests, added users to UI