re introducing tests and dealing with an empty message