removed HashableSpan, and fixed some tests