update tests to reflect new directory structure