YH-26: Test coverage