More tests, more fixes from testing.