Improve unit test capabilities for complex scenarios

Followed from !137 (comment 658270629)