More test coverage, esp for error handling cases.

Refactor out patching bad random, more err coverage.

Updated per Rog feedback.
Merge pull request #17 from cmars/more_test_coverage

macaroon: more code path test coverage