Issue #3547173 by mondrake: Complete test annotations to attributes conversion for all remaining tests