Use keyword arguments instead of Options

Also add print_wrapped test