Got the tests passing again.