Renamed standardqueryoperators for tests
Renamed standardqueryoperators for tests
Added dematerialize
More work on the tests