fix using raw call in modal_helper
improved test coding style