Refactored tests slightly