Improved types and its unittests

No match.