Some improvements in the test
created mixin, and extention to several types