Merge "port some servers tests into nova v3 part2"