Merge "Adds tests for resize server for swap"