Fix tests when not using site re-use mode