Merge "Fix TESTOPTIONS and SUITES variables"