Added the new TDGs to the setup and teardowns