Fix a couple of helper requires that were missed. This was causing the tests to fail to run on 1.8.7.