add needed e2e and unit tests
add needed e2e and unit tests