moving to standard directory layout
fix for test failure after moving to standard directory layout