Cleanup
Add more tests