structured in folders
fix the tests