add Users controller, clean up tests