Made fixes for unit tests.