Editor review round 5: Fix autosave test page, don't forget mixin
Editor review round 6: Fix test formatting/comments and one mis-merge