Fixed formatting

Removed unnecessary logging
Added Datastore tests