Cleaned up the paths in the unit tests
Renamed for easier imports