small refactoring
refactoring
added e2e test
added e2e test
fixed e2e tests