added some stop-facilities to fix test.
Authored by: mrieser 2009-05-18
Parent: [r6944]
Child: [r6946]
