Fix History.js definitions and tests
Fix marked definitions and tests