Added Oscar Chavarria tests