Dev

Thanks for the heads up on the changes. I'll change the tests for the default after I take a closer look and test some more cases.