8fcfe2862fd4fde4793e232cfeebe6c5540c80a5 and 0cceb54366b406649fdfe7bb11b133ab96f3cd70 fixed those tests.