fixed some tests, but others broke