Fix and re-enable the test handler