Update scala test. Check token boundaries.