Fix chainable wrapper and add tests for it