Update modules, glue and tests :cat: