A smidge more tweaking of the smoke test site stuff