[Sprint/KiltedKoala] (feat): e2e tweaks

closes #1709 (closed)#

This passes e2e tests consistently. Changing it to done so we can get it approved and merged in