Testing refactored implementation.