Feature/fix e2e tests

Created by: hixi

Fixes the e2e test not running; fixes testing issues with normal testing as well.

Reviewed by:

• @das-g

Don't review the yml files, they are autogenerated.