Code coverage, minor changes, upgrades work