Partially fixed tests to be up-to-date
Integrate database upgrades