Add stats, tests for stats
Fix tests and redis mock