reverse error order and clean up tests that depended on old order