fixup! Add more tests for opaque-keys