Re-enabling fixed test cases

Conflicts:

	test/integration/smoke/test_scale_vm.py