make shutdown message more clear in logs
fix test numbers