Fix spec style

  - Singular factory names
  - Use 'let' statements to assign factories