Improvements on tests.