Merge branch 'add-tests' into devel