Update test setup. Fix tests.