Added unitests.
Added few more suffixes.