Move testing bits to new testing menu