Updated for more test coverage. Argo @ 99% coverage