Adding the test files I used
FIxed conflict and removed some unused files