Refactored (renamed) the helper classes and corresponding tests.