Fix some nondeterminism in the specs, caught by Travis