Change suite creation and options to match test.tree.jenkins 0.9