added todo
added tests