Update tests as per BUG 15149.
Required state for BUG 15149.
Fix to issue that prevented test from finishing cleanly.