ENHANCEMENT: Update to unit tests.