Some tests/fixes.