Refactoring the soft reset tests to eliminate some magic numbers and duplication.
Merge branch 'master' of https://github.com/tdenkinger/catamaran