Add an Utility Class for test, and one more unit test.