Added upgrade test from 2.14
Merge pull request #44 from lsolesen/upg-214

Added upgrade test from 2.14