Some test fixes.
Some extra fixes.