Adding few unit tests and dump printing