Fix for failing tests