Improved DatabaseTest