Got 5/9 tests to work