Fix up keywords, following changes in the HTML from the wiki
Run the --example test in the standard test suite, also test database generation