Moves the pending test to the right place. Also moves some dirs around