Change file names and add more test