Updated python cw-2 framework to have better messaging and also support both Test and test references to the framework.