Even more tests and fixes.