cleanup duplicate tests
Merge pull request #1221 from elevow/cleanup

cleanup duplicate tests