100% core code coverage again