Merge pull request #29 from jbaruch/master

ning-services tests fixed