code cleanup
new test cases small bug fixes
Authored by: laemmel 2009-06-24
Parent: [r7492]
Child: [r7494]