Possible fix to a problematic test. Could be more tight.