Fix build errors with tests
Merge branch 'feature/mergeSandbox' of https://github.com/OSSIA/i-score into feature/mergeSandbox