Add extra debugging/testing controls