Added some unit tests. Added namespaces to unit tests. Fixes in code. I missed this two files in last commit.