fixed tests paths, and renamed test files for clarity
Merge readme