Tidying up paths & attempting to fix specified directory path for test