Fixed some of the tests that weren't passing.