Refactored some unit tests slightly