Unit tests fixes.