- Tests cleanup [quality karen]

  Need to resolve the following issues in testscript used to test build2:

  * &&-expression fix for cat & build