Merge "Create tests for multiple server creation"