added AjaxDeferTest
fixed merge conflict