My first pull request
Complete unit tests