Modified
  database test hack thing