More test code removed