Improved DB onUpgrade method
Restored DB version, used only for tests