Reorganise the testing section