VE-1592: Fix all tests + carry over <gallery attributes