drop check for ajax and fix tests