You may be able to use a similar strategy as this one when it comes to testing for the water pump.

http://autospeed.com/cms/A_110478/article.html

You can also check to see if something is awry with the water pump by seeing if there is any shaft play.