Feature/more e2e