Refactoring to remove reliance on `Function.prototype.bind()`, getting stub test in place