fix wrappers support, add tests