Clean up tests
Add additional Totals