Fixed formatting

Removed unnecessary logging
Added Datastore tests
Let's make this class a little more useful than just returning nulls