Refactored tests to be more concise