fix tests (a side effect of the ordering change is that unit tests happen first)