Cleaned the management of tests