Added tests for visits & others
Fixed calculation of various totals