Merge "Updating test-suite to match core" into devel/master