Added unit tests for datastore.  Fixed up the $ and $ regex magic, so we can unit test individual src modules.