Added bin/test-wrapper

Fixes #786