More tests and fixes.
5 files changed