Test fix, return the correct context.
Code cleanup - remove redundant using directives
 Code cleanup - remove redundant qualifiers; remove unused variables; use object initializer.
Merge pull request #1410 from damianh/wcftestfix

Fixes wcf test