Extremely fast resolver optimizations
Modified test expressions