Refactored some Tests