adding chirs' & roberto's tests