cr feedback
adding some tests