Add upgrade test, separate check test out