Fixes #14 Remove duplicate test definitions
Merge pull request #15 from Pngv/upstream-fixes

Fixes #14 Remove duplicate test definitions