Remove old test data, auto select first option
Merge branch 'master' into gh-pages