Update tests, change user controller for admin controller