testlib enhancements - #157 to master branch