Minor changes to Test.cpp and Test.h
Merge remote-tracking branch 'origin/branchtest' into branchtest