Upgrade to latest empirical and fix tests.