Testing refactors