Some fixes for some tests.