Finally achieved good test coverage