Added Admin tests and fixed bug