Bit of cleaning up, and an additional flag for model test script