Merge "Add tests for onUpgrade logic"