Cleanup
Fix test