Initial testing
Improve args matching and mocked exception handling