Merge "add server resizing tests"