Make persistent datastores singletons
Remove redundant --timeout flag

Test timeouts are already set in test/mocha.opts