fixed small issues that caused bugs in standard tests
tested with workflows 1325.0 (fullsim) and 135.1 (fastsim)