Better test support