fixes for tests after changing project structure for compat mode