Added test for non-local mode