Add missing pieces to pass all tests (except the verbatim ones).