Add adapter from common to fix test
Fix error with UTF-8  encoding
Make marketplace package work