Feature/fix e2e redux

waiting on DNS storm to pass...