Fix failing spec with table reorder, lambda-fy scopes that use time