put tests in order a bit