Several improvements on test coverage.