changed dir structure for tests