Switch to new snippet module & update tests to suit