Proposed fix for intemittent test breakages ("-k" flag issues)