PLAT-5616 - Tweak tests for more variety