Tests work after changing format of resource id line
Further script refactoring
Much refactoring of maker.sh