Revert "Amend some tests so they pass."

This reverts commit b40994ce0062594715367643dc42471513f7718b.