Merge "Ensuring test files match dali-core/adaptor" into devel/master