Ok, leave the escaping tests in their own method. And leave the hashes as is for now, it's already a bunch of changes to grasp, moving more lines just to do this style change would just make the diff more confusing now I guess. So, ignore that comment :D