[WIP] - Provision test cleanup

Provision cleanup