Move objs and fps into list of tuples in unit tests