Dont return deferreds

This only fixes the changes recently introduced by PR #30.  Perhaps it would be best to make all the tests not return deferreds with this PR.  Maybe on Monday.