Add test files
Merge branch 'integration' into devel