Integrate tests working on target_class version.

Mostly mechanical, but nice to know that it goes.