fixed all the failing tests