Fixed broken test and updated UPGRADE.md with 2.0 information