fix paths for tests
clean up
fix paths, proper