Improvements to Testing framework
Basic testing for admin