Fixing failing tests...