Support `enableBatching` option

Duplicated tests for the option. Now I want to get rid of the deprecated stuff to clean up the lib :)