This needs tests adding for it for the above utiliity methods. You even wrote the tests in the comments! Now just put them in unit tests :)