Tweaks / fixes to test logic