Update for recent mode changes
Update tests for newer GHC and package versions.