improvement on tests