DB/TestDB Schemes adjusted