Refactored some test classes