lots of fixes, including to the test script which was being silly
276