More tests, fixes.