Fix hanging rose-rug-brief-tour test.
Fix OK logic.
Merge pull request #658 from matthewrmshin/fix.t.rose-rug-brief-tour

Fix hanging rose-rug-brief-tour test.
Merge branch 'master' into gh-pages