Fixing up Analytics with testable things