Fixed formatting

Removed unnecessary logging
Added Datastore tests
There are a lot more use cases than tests in this UnitTest.

If we are adding placeholder tests that don't have full coverage, let's add TODO so that we know that we need to go back and add unit tests.