Refactored first test case slightly