Slight improvement on tests.