Refactored argument defaults
Refactored test spec