Remove unused code
Fix path to files for tests