added cli args and fixed unit tests