fixed failed unit tests