Fix contains deprecation. Also add DataArrays dependency
Fix a few remaining syntax errors in the api/test files.