Test coverage extended