Merge "Separate the deleting server tests"