Align test scripts and playbooks with engine

Change-Id: I845fd140eadfd454587c031682e73a059d55cc92
17 files changed