Fix options issue.
Fix options.
Fix test env.
Move tests.