Got cr rejection running under the new file naming convention. Added some more tests.