Merge "Add some unit tests for PB transitions" into main