Refactors unit tests.
Refactors ContainsXX related tests.
Removes some useless TODO comments.
Thanks the lib reviewers within the Readme.md file.