Improved upgrade tests
- removed unneeded code
- added additional logging info for failling tests