Attempted to fix unit tests.