Phase out deprecated tests