Fixing tests

Basically making sure you do not return empty promises. HTH