Added one more case to the suite, and some refactor