Patch in #34 looks good. #35 confirmed that tests are indeed failing.