some refactoring and pended failing midpoint test
Merge branch 'development' into ux
changed cucumber tests not to expect midpoint marker