Reorganize options
Import eof option
Import escape tests