fixes bug 898041 - Use "WaterWolf" and "NightTrain" in all tests
pep8 fixes
Merge pull request #1366 from peterbe/bug-898041-use-waterwolf-and-nighttrain-in-all-tests

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