Bug Fixes forquality testing