Don't have two has_many relationships to same model
Update tests I broke in 1b3601d3