Merge "Tests switch back to the initial user upon test execution." into pie-cts-dev