fixing couple of test cases due to change in the system
major changes to the way Admin works (Admin is a user now)