Adding more end to end tests
Merge branch 'james_branch_2' into dev