Merge "Add "delete a shelved server" tests"