Fix all current tests