fixed failed unit tests.