Merge branch 'feature/test-suite'