adding tests and cr feedback