Fix duplicate test targets, fix 'make tests'