Fixed initial tests, still have broken unit tests