fixed return of (0,) tuple if key not found; basic count_analytics_test committing, enhancing some other scenarios