Use the subject format to be consistent, remove extra expectation