Was a little over-zealous in what shouldn't happen outside of test-mode. O_o