r9123: test & capability updates