Extending and improving current test automation

[lvanvugt]

Issue

We do have a number of automated tests in place. Scenario names are to general, so that needs to be updated and in the meantime we could also extend the number of scenarios.