reordered a couple of tests