Enhanced/extra/corrected/more readable tests

- Add a few tests for error conditions
- Reword some existing tests
- New mock requests to support new tests
- More readable test code, hopefully