Fixing tests which appear to have been broken for a while.