improve wrap combinator
cleanup tests