iS-4: Fix tests.