Automated tests improvements
This merge request is now ready to be merged. It continues work from merge request "Automated tests scenario 2 part 2".
This merge request is now ready to be merged. It continues work from merge request "Automated tests scenario 2 part 2".