Locating Thermostat & Temp sensor

Thermostat is located on the engine block down towards the alternator...

Slightly off topic but you can actually diagnose a really knackered water pump by sticking your fingers in the water gallery (once you have removed the thermostat) and feeling for the impeller blades! Obviously with the Timing belt tension there 'should' be no play at all and no missing blades...

The temp sensor is just to the right of the cam cover, someone will no doubt post some pics very soon :)
 
I hope so mate cause I'm not 100% sure if I'd be able to find them. Sounds like they're in a tight place. I'll take some pics and post them to see if I'm looking at the right place. Just out of curiousity why might I have a knackered water pump? as I've recently replaced it with the came belt on the 60k service, so could it be that Audi fitted a faulty water pump? and does the water pump relate to the thermostat and temp sensor? Thank for the help