Added more tests to enable 100% coverage as required by clover taget
7 files changed