Add a "test" target to the Makefile to make it easier to do CI
Merge branch 'develop'