More tests, more fixups.