fixed the last failing tests