1996 mercury sable 3.0?

car was running but water pump went out...had someone fix the water pump and i pulled it out of garage to test drive...went fine in reverse but as soon as i put it into drive it died...also runs fine in park but when i hit the gas in park the rpms went up and stayed up for a little even after i took my foot off the gas...please help