merge. latest changes to testing.

Change-Id: I76bf21245ec800d85604cd07428b0e9787fc25c4
add. try finally block to ensure that teardown gets called after init_test_repo.

Change-Id: I23085215b17ac7ba82cd5f272c139bd5d60ee668
fixes. rename non-test methods in test.py / ensure deploy dir exists / fix config.

Change-Id: I076a689228f70cf018aba7b7735ab703e789f2dd
fix. Ensure args are provided in tests where required.

Change-Id: Ie08016bdffcf1d8a33b6435e34cc5a9ecbb6fcb5