Count projection, not correct yet
Correction of a broken build
Refactoring in tests. They do not work anywok together