New configure table construction
Merge pull request #491 from seandst/configure-tables

New configure table construction
trolololo
Merge pull request #492 from seandst/configure-tables

trolololo
a few minor test fixes/cleanup
Merge pull request #494 from dajohnso/fix_tests

a few minor test fixes/cleanup