Editted several files for test at Gompers