Fix unit test build
Use macro for generating wrapper impls