Hmmm I see (sorry, completely missed that). I however think that if this is changed a lot of tests will break, should I go for it and changed it or put is as a part of a separate pull request?