Installer tweaks + unit tests closes #6356