Fixes on tests.