Add more unit tests
Added more unit tests and CLI parameters