Using Trial

Did not remove the doctest tests, just added Trial+unittest to
datastore.