make work working with the new structure and test files