Use standard HTML attribute + update unit tests (#2745)

5 jobs for 2745 in 9 minutes and 47 seconds (queued for 4 seconds)