Added title-based tests, and yes tests are broken :(
Fixing the tests based on changed markup