More fixes and a test for yesodweb/yesod#692