Adapted tests to new directory structure