Fix tests
Add tests for admin