Extract server/test/helper
Move fixtures inside of server directory
Merge branch 'move-fixtures-directory' into staging

* move-fixtures-directory:
  Move fixtures inside of server directory
  Extract server/test/helper