Some more modifications

removing numerical lun units - thanks to D. Fanning
Modified the tester to work