Streamline ivar declarations in one method
Improve tests to cover more cases