Clean up test code
Add need