add resolve-replace back to test