* modernize ivars in tests
* fix borked tests from global search replace