Fix Clean up test code
Clean code