Merge "Updated test files in line with dali-core" into devel/master