Refactored SnapTest