some tests fixes.