minor test fix
Merge branch 'dev'
minor
merge with dev, pulling in new batcher functions
rm disclaimer