added tests
added todo