Remove unnecessary wait(), change tag in test

Remove unnecessary wait(), change tag in test #856