Gets tests to pass on 1.9.1