Count id parser test
Rework object builders
Fixed some tests