fixed tests and fixed provisioner merging