Test coverage upgrade