Abolished client/server test directories. It's all one happy family.