Updated tests.  Switched from deferreds to callbacks