Fix last failing tests