Test tweaks and :smoking: and :coffee: