tests pass now on Base-X