Add some tests
Update TODO