Stuff related to client-server testing

Do you see any point in splitting the method into 2 parts, especially when the only occurence is in this class? IMO it asks for trouble when sb forgets to set the context in the future.