dup test names
Bring forward tests to trunk