Simplified and tidied some overly assertive tests