Updated files, with new testfiles

To some extent removed unused files added some new files for better
testing