Fixed some overly stringent tests