Install testing fixes

cleanup some knock-on from other changes