Related issue is #38. Time to start expanding functional test coverage since the integration tests missed this.