gets some more tests passing