Remove use of `subject` in tests