A bit of reduced duplication; add total/subtotal tests
Add custom totalling test
This is now called on the DataTable module