Getting all tests to pass