Fixed failing test.
Fixed some more failing tests.