new tests and fixes.