Backfill tests for #216