Per IRC, @glogiotatidis thinks we should merge what we have and follow up with test_utils later. Let's do it!