refactored tests to be more concise