Fixed various unit tests.