Various tests have been proposed for the two-sample problem when the alternative is more general than a simple shift in location: non-parametric tests; O'Brien's generalized t and rank sum tests; and other tests related to the t. We show that the generalized tests are directly related to non-parametric tests proposed by Lepage. As a result, we obtain a wider, more flexible class of O'Brien-type procedures which inherit the level robustness property of non-parametric tests. We have also computed the tests' empirical sizes and powers under several models. The non-parametric procedures and the related O'Brien-type tests are valid and yield good power in the settings investigated. They are preferable to the t-test and related procedures whose type I errors differ noticeably from nominal size for skewed and long-tailed distributions.