Add wrapper and test runner
Merge branch 'dev'