Mutant testing

First pass of changing code to be mutant friendly.

While it is a bit excessive, trying to figure out how much it costs to be mutant friendly