'tests' fixes.