More tests, and tweaks to setup.