Refactoring socket tests
Fix bug with decellaration during flying.