Remove the invisible body in support; Add temporary tests to verify correct support completions for upcoming support changes.