Work on tests + fix for mutiple activities reports