fixes for two system tests

1 job from fix/flash-messages in 35 minutes and 48 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  Test
passed #34820
test

00:35:48