Mac Work
Added Tests, Fixed Param Sanitization