Changes due to using swtest samples

Nicole Skidmorerequested to merge
reimplementtests into 2024-patches

With Moore!3969 (merged)

Edited by Nicole Skidmore

Merge request reports