Modified
  more database test hacks for appfog