Removed abort so all tests pass, looking at different solutions