Variable name changes and addition of files to help with creating tests
Added more files to help with testins