Updated e2e scenarios

Added a couple of scenarios that pass, but the functionality isn't 100%
yet