Fix, upgrade, and expand tests