Refactored unit tests via use of TestHelpers.