Fixed the last error in existing unit tests

Now all tests pass for existing unit tests.