Improved test code coverage within the 'core' module