Adjusted tests after issues in OE-3959
Merge branch 'develop' of https://github.com/openeyes/OpenEyes into develop