moved regression tests around (chnaged ordering a bit)