Add tests for combined has_many associations