Issue #183 & test script cleanup