Zza: cosmetic changes to testFns.js
Zza: updated tests so that they conform to the dataservice.ready change (promise, not callback) in a recent commit
Should have run these tests then.
Merge branch 'development/zza'