IW: Add more tests, use subject in tests