ENG-5333
erase println
ENG-5553 (2)
Merge pull request #1778 from guotong1988/master

Tong's first tests, merged to a branch running tests on Jenkins