code coverage brought up to 99%