Refactoring the soft reset tests to eliminate some magic numbers and duplication.