Added tests, - coverage at 91%