configuration file cleaned up
tests adapted on new project structure