All the current tests pass now!