Added tests
Removed todo