Merge "Syncing common test files." into devel/master