Fix for bug 938, additonal tests

Fix for https://bugzilla.52north.org/show_bug.cgi?id=938