Added one more test to the suite, and some refactor made, still not finished