Fixed failed tests