added tests into master branch, and small TODO that could be awesome.