Finish testing tweaks, pair with @arigonzo on this one.