Re-write instance_eval tests to be more 1.8 friendly