Make naming more consistent

No need to end filenames with _test