Add expansion selection modularity, test script