Fixed class/instance scope bug for per_attribute_iv_and_salt.

- @WIP there are three failing tests that I'm trying to resolve.