Beef up those tests.
Beef up those tests some more.
Backend stuff for batching.