Modified integration-test to handle path changes according to new dir structure