Update filenames, add tests, and config usage