Update tests with new directory file structure