Pull changes from Pipe Scan
Fix tests