We can now adjust test complexity in a single place.  This allows us to make our unit tests a bit quicker, but still allow them to easily be changed for more stressful testing.
Some additional places where I missed using the new constants.