remove callback
simplify test executor