work on tests by mbadolato and merged