Add in fix from @andrzejpolis Fixes #5384 Fixes #5386
Fix example to contain expectation
Fixes #5449
Fix rerunning sample specs without new dummy app.