re-organising and adding a test script
preliminary re-factoring