Bill 46: Minor changes (PR #304)

Submitted by: mfosterw

A couple things came up during the last PR which were unrelated to its main purpose
+88 -94
✓ Yes: 1 X No: 0
Bill 48: Fix inconsistent test (PR #308)

Submitted by: mfosterw

I made a brittle and difficult to understand test, so I fixed it by adding a branch and a bit more checking
+4 -3
✓ Yes: 1 X No: 0