wrote more tests, still not fixed