Fixed build, added more tests for admin views utils