Fix some ivar masking in tests