Add a functional test to make sure the issue
 @adammeyer encountered doesn't return