Try to remove should_not from specs in places where it could be phrased differently

Remove some test duplication, lots of assorted fiddling around with _spec things