organized tests
Merge pull request #23 from trosborn/admin

organized tests