Merge "create unit test for shouldShowUpgrade function"