fix infinite loop when running remote tests
split scenario that failed on jenkins
Merge pull request #537 from ministryofjustice/fix_infinite_loop_in_remote_tests

Fix infinite loop when running remote tests