Added Admin tests and fixed bug
Merge pull request #135 from dantleech/admin_tests

Added Admin tests and fixed bug