changed arg format to be more conventional. updated tests