merged with the changes for the editors and formatters
added another test page