some polish to ship gun API, writing api tests