Work on fixing tests
Fix tests.