Add tests, correct filenames