Fix namespacing error and include "should" api.