Added tests directory and made changes to file names