rename some test contexts to be more usefull.
add a fix for addresses with ' sign.