Started fixing broken tests.
Fixed more tests.
Fixed more tests.