Update to use 'subject' so tests don't conflict with eachother
Restore patch from #1144 that was somehow lost.