Tests coverage improvements.