Cleanup on duplicate test expressions As pointed out by Thomas Jarosch <thomas.jarosch@intra2net.com> Daniel