renamed parameter
testfix
test fix and minor update of regexp