Added some test files, corrected things around...