Cleaned Argument Values and Added Tests