Added missing CxxTest code and test files that escaped last commit