fix e2e tests and do this stuff below...
Currently e2e script does return 0 exit code when tests fail, that needs to be changed.