Fix for pass DatabaseTest case