Added test data files and command line options