more tck bug fixes
Clean up and fix batch increment with init value