Refactoring... test should be passing onw