Add admin tests and refactor new and edit user forms