updated for writing tests
commit for adding tests
fixed merge conflicts