us5250 Unit test same as previous commit
us5250 Unit test more file need
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975
us5250 Unit test part II
us5250 UT forgot one file needed to push
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975