improvements in code coverage and Extras robustness.