Minor conflicts in file names and tests location need to be fixed