added more tests and admin functionality