Add fixes for unit tests.