Fixed a majority of the tests. 5 still not passing.