Fixing dependencies
Improving JUnit tests of the upgraders.