Cleanup
Added a test