Merge "Add tests for creating servers with (anti-)affinity"