us5976 - fix broken UT. Bad QA
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975