All tests now pass