Fixed formatting

Removed unnecessary logging
Added Datastore tests
What about using things like MockContext?