Slightly faster
Make key error explicit in tests.  Fixes #180