Fix spec cleanup to use unique ivars