Adapt the tests to the markup changes made by @vetslav