Fix Tests
Local Resolve improvements