Major fix
Testing refactor