fix failing tests again