Set activity to None in order to fix tests
Work on change requests, activity templates...