Updated some tests to move towards convergence with mutagen.