Changes in testcommon.js according Brian review