Added upgrade test from 2.14