Fix variations in the tests