Testing refactor