Remove unnecessary API
Fix key normalization. Nasty missing parens bug
More tests
Merge branch 'more_coverage'