fixed broken test and file path fixes