Changed to design suggested by Vivek. Cannot get the non-local test to run