Fix duplicate test targets, fix 'make tests'
Merge pull request #209 from tribal-tec/master

Fix duplicate test targets, fix 'make tests'