Small PR to clean up the folder structure for the tests for core-utils
so that the folders follow the source folders and file names. Planning
to make some improvements to these tests, this is a first simple PR that
will help me do that.