Correct duplicate test with use step.

Fix #299
Merge origin/master