Fixed current tests