[WIP] - Provision test cleanup

Provision cleanup
Sure, I was just refactoring ;) Not improving, but I can do this whilst I'm here :)