Fix up issue with errors not returning correct when setting  incorrect keys
Remove the vendors from the code coverage.
Add in more tests.