Much improved testing coverage.