Enhancetest

Test coverage increased to 94%