Fixed BW, Updated Tests