Restoring former snippet behavior & adding test to ensure future behavior