Made some changes to some files and added some test files.