fix units tests;
refactor CFGridWriter -> CFGridWriter2