fixed all failing tests