Changed order a bit to make running tests more sensible.