Make some changes to up code coverage to 87%