Hook some interpreter tests in
Make some properties local to test targets