Issue 3156 broken unit tests