Moved the extension method into the proper file. Fix for Issue #27. Fixed TestClients.