Set provision flag + fix related tests