Re-added some location tests, checked that onRun is failing.
Set location *after* stopping first controller, before starting second.