optimize some specs by using .new instead of .create
fixing merge conflicts
Merge branch 'motasem-salem-partner_id_seq' into develop