SCAL-265 - ShellBasedInfrastructures fixes, improvements and tests