More invalidation tests. Fixes for #1.