[minor] adds TODO

This commit was sponsored by pebble {code}
http://pebblecode.com
[tests] adds previously skipped tests

This commit was sponsored by pebble {code}
http://pebblecode.com