Improved coverage of core classes.