TestSlave refctoring.