Add @carlosmn's tests