Expand S2Cap coverage. Refs #55