step 3.1: small test tweaks
step 4: cdq