Backfill subcommand tests
update for β3 Swift changes