e2e regression test fixes 3 17

Created by: uwedeportivo

collecting all the changes i'm making to get regression tests in shape (i'm a bumbling ts idiot, so...)