Improve the tests and add admin user