Fixed some failing tests.