Upgrade test module to latest core changes.