fixing tests, and passing tests.