Fix messages for tests