Break tests with reorganization
Fix test requires, Rakefile test glob
Add URI parsing to datastore instantiation