moved a couple tests around