finished transition to Jig framework