Tests and fixes.