Reorganise unit tests to obviate the use of del