Better support for '%' within the msg
Fix test cases
Copy tweak