create unit tests and refactor Argument to namespace