Modularization of reconfiguration
Removed empty test