Refator scripts to allow neutron tests