moved a few tests around