improvements on tests