Add changes to CHO test