Fixed formatting

Removed unnecessary logging
Added Datastore tests
Oh, Look like you are still working on this CL. I'll wait until after you are done to do the review let.

Let me know whenever you are done with it