Cleaner message construction, test fail messages