Test fixes - not tied to any story

Test fixes to reduce flakiness.