Reorganize to prepare for different instantiators
Fix a bug in test case due to incorrect shrinking