#1 - improve test and code coverage