Ref #12 - Added tests to cover defaults