Temp fix for UnitTesting database errors