changed to misterflibble's pointless(TM) format for tests as well