StatsActivity Testing Complete

And a few bug fixes