Fixed current tests.