Initial checkin for drawtest