remove entry_id from activities, continue testing nested through model