fixing tests and refactoring to /admin. not 100% yet.