Changed input file names, and added all tests to one file.