small improvements on tests