3699 - More test tweaking because I'm obsessive compulsive like that
3699 - Fix a couple of occurrences that were missed last time