Update suites, add master/slave templates