gut users, and update tests to passing