Nit: using when-not when appropriate
Fixes for bogus tests
Non-anchoring pattern matching (fixes #22)