rework smoke tests to be java7-compatible, also smarter dealing with provisioning