small changes and adding unit tests project