Got the majority of the tests passing