Incorporate torquebox script changes from qa-02 tests