Fixed tests (to accommodate make_random_preferences move)