Clean up
Rename test