Adding more extensive argument testing
Adding explicit named instance resolution