Query modifier, split tests, remove Socket