Fixed broken, and duplicated, test
Added upgrade path concept to prevent re-installation of binaries when not required