Merge "port test_services into nova v3 part2"