More thorough tests for 6d7cce3ba4ae0a7f1eec2b52f4d22656dcff15d5