Fixed failed unit tests