Add a testing, code coverage: 83%