Rearrange usage tests
Better usage for methods with more args than generic.
i.e. when the generic includes ...  Fixes #154