Tests change because of using 'dorun'. WIP fix