New UT alignment

Marco Clemencicrequested to merge
cherry-pick-8b2ff637.2 into jonrob/all-pmts-active

See merge request !64 (merged)

(cherry picked from commit 8b2ff637)

Merge request reports