+ added a test
+ added TODO