[Tests] fix unit and e2e tests