Rip out mini-test handler