add multi-test support