Fixes assertion errors, yay for green e2e :)