refactored to reuse content, fixed failing tests
refactored to reuse content
enabled one of fixed tests
refactored to reuse objects
refactored failing tests
Merge branch 'e2erefactoring'