Tests passing again, Except the tricksy modal mock.