Update WAPackIaaS functional tests to accommodate project restructuring, misc. cleanup