Minor changes to make sure db testing migrations works fine with newest changes.