fixes bug 898041 - Use "WaterWolf" and "NightTrain" in all tests

@rhelmer r?