Greg/new test dbs