All current tests passing again