Shuffles test/templates around a bit