tidy volunteers complicated with_billable_hours_scope up and add a test for not including billed again hours