Begin update of unit tests after most recent refactoring.