moved a few tests