Separated out End to End test into its own file.
Merge remote-tracking branch 'origin/master'