Some tests and fix.