Added test of expected failure in ControlTest and extra expects to catch subtle changes that could be happening not as a result of the tests.
refactored out the 31 case else-if statement in favor of a map. Tested with our new unittests and everything remains working!