rearrange some tests to hopefully shortcut a little sooner on certain tests
resolve merge conflicts