Added some more test files, Working on fields