#15, #10 code coverage upgraded