fix unit test and perform small refactor on other errors

[peczenyj]

1. I note that one unit tests was failing
2. since the min go version is 1.13 we can use %w to wrap error instead perform string interpolation with %s
3. I fix one typo in one error message
4. In one case I switch from fmt.Errorf to errors.New since the has a simple string message.