Ugh. Update tests some more. This is painful.