Fixed formatting

Removed unnecessary logging
Added Datastore tests
Can't eat exceptions in tests unless you expect an exception in which case you need to use the pattern

try {

fail(....)
} catch {
assert e.getMessage
}